Revert 0fd7012..5c0d93c

This rolls back to commit 0fd7012bb40350adc21441d579fdf45689ae00ee.