Revert ff95650..0aab278

This rolls back to commit ff95650bc7d58f2172c1985f5d41daee80cadc19.