Revert c3f30a5..26cad89

This rolls back to commit c3f30a5a40b813058ddc6fb55e344ecac95b13a9.