Proper fix, reverts https://github.com/garyfisher/GaryMoveOut/commit/21203e89fdd63fa128e33ca99092583853c23151