Revert bc9fb5a..f71bd2e

This rolls back to commit bc9fb5add89aa9f973750c768859b47dd0a4df04.