Undid a minor refactor