Reverting some changes to see if this fixes stuff