Revert ef00135..e9c3b6d

This rolls back to commit ef00135fd81d8bb8497edf85856d41e60e0ea5ea.