Revert 5065ab8..17cb5d6

This rolls back to commit 5065ab8aafa5a8d97d84ed585b08535ce1842d11.
Final