Revert this I don't have time to refactor for now.