Revert c900311..fd9f4ae

This rolls back to commit c900311a8bfb7d59ef9ec9cbc05ea3ba1f3fcc3d.