Reverting some back to minimize diff
Reverting some back to minimize diff