Revert c1e40bb..041cac9

This rolls back to commit c1e40bbbaf46075e357ceab5a60410aa25ba6ad7.