Revert 98d7ba1..82bf999

This rolls back to commit 98d7ba1141d400490bfa3a296a7a4df5b680e691.