Revert f607ad8..9a0ee91

This rolls back to commit f607ad85032a7bc671c2a0ff30ee353baa8ba07b.