Reverted my fixes because they were breaking stuff.