Revert b914996..5afda5f

This rolls back to commit b9149960c7e1f60e6364b839d68ecd6b27debae6.