Revert 985237f..e4a7d4a

This rolls back to commit 985237f2e84c55b430c42b5c38b044ea73abbb80.