Revert b99df96..b032eb6

This rolls back to commit b99df96b1e782964c928af6ff678bcfb06c1155e.