Just completely revert this, can't figure out why it's giving some people trouble still