Reverting some changes for backwards compatability