Revert "remove un-needed lines of code from merge"

This reverts commit e32fd3b7c554574fef72f8d1c7dbb5aa5d23cecf.