These changes should be moved out of this PR. (I believe this problem has been fixed already)