Revert 9f52c96..d0e4c83

This rolls back to commit 9f52c96899ef742c47c4d30d2a1d13aab549eda4.