Revert 3fdd8bf commit.