TRQ-2688. Remove part of the commit that was a little over-constraining.