Revert 8073b45..478427a

This rolls back to commit 8073b45d9267c7d09914d7bde80123ffcdf4311d.
ugh. not sure how to proceed