Undoing the previous change to address rm2400

Addresses rm2400

The previous fix to rm2400 is unfortunately breaking a few tests. This commit
reverts the previous fix in order to add a new fix.