Revert f98d3df..af07ea2

This rolls back to commit f98d3df9db1438cff25806b9056e9a0acc69c630.