Revert 9ede142..9805247

This rolls back to commit 9ede1425f4cacaa4a3c7d42b725b2893ec6e11b6.