Revert 571ba592.