Revert 416492c7e5.