Revert 35d3b31..aa42b37

This rolls back to commit 35d3b3194c0f15ed9c2cb0cc7840b539b7468506.