Revert RM-2457 fix

The RM-2457 fix resulted in a regression.