Removed the temp fix I implemented from another user. Should not have been merged.