This reverts commit a52d7a21f0, reversing changes made to d21abaaa35. Premature merge. Will bring this back in after #41 merges.
a52d7a21f0
d21abaaa35