Revert da7df60..ff245e1

This rolls back to commit da7df60311793c07034ab1b905fba48afab3586d.