Revert 42c27de..4d6cac0

This rolls back to commit 42c27de7c08fe0793c227e5b30ecb1adb0ab2220.