Revert 1038490..2e84e8a

This rolls back to commit 1038490825b4feffaf91eab71801bcb229e9f56b.