Revert c0c5d6e..f11dc68

This rolls back to commit c0c5d6ea19b2916336e87f01609849ad699c562a.