Revert yesterday's change, per Bruno's request here: