Revert e6f93b4..0731cc6

This rolls back to commit e6f93b4f5af31ac1950eba9fe49b6b35007db60f.