Revert c6e3242..42fc258

This rolls back to commit c6e3242ab8d70239ebe1c82a6d0c7526876ee370.