Reverting temp fixes - missed a line

Reverting temp fixes