Revert change to regression (#6940)