Revert 7d0cf3f..42104c2

This rolls back to commit 7d0cf3f05f646113808bd951ab59b6d46ff22a93.