Ajay/Melanie | #0000 | Reverting change - since no effect on generated query