Pushing revert fix code to Production

* reverting Bryans fix