Revert 3a904e5..359d7e6

This rolls back to commit 3a904e5b8536d9aaac9d39ade747d1831f43b432.