Revert 5931dfd.