Revert c4ce0e8..94dbe11

This rolls back to commit c4ce0e8a29368bbbca5d66362a76ea83b6a869c3.