Revert c86db1a..4baa208

This rolls back to commit c86db1abc24838d593bba407b534ab9a59af9da0.