Revert 0734275..147ad10

This rolls back to commit 0734275f057f352e284ac76f3de5c73171a1a606.