Revert Alex's revert of Anthony's code.