Revert change that accidentally slipped in [bbfaa83].