Revert 73cee79..065b089

This rolls back to commit 73cee79d0f27441bdce0b6293250024d419bd8dd.