Revert 5d3fa01..48083b0

This rolls back to commit 5d3fa01fa65bff84994692aa7ed44affc2051b2e.