Revert 92f3d6f..a494c79

This rolls back to commit 92f3d6ff807681a54feaca96dc397d12b4a0e3c4.