Revert 2f0a6b9..4d62a5d

This rolls back to commit 2f0a6b95e776d3e7d9dc6a0fe89562d0d2d7c7c8.