Pushing fix revert to Staging

* reverting Bryans fixes