Backout changeset f12e5c87adf6 (bug 852950) because it breaks running from dist/bin