Revert 7282c0ee5b, now that 0ac18551663876 has reverted bdcf0d188