Revert c40f188..4dd45e0

This rolls back to commit c40f1881591ded3ca2636dfadbf98ba318a596ff.