re-enabling origin to fix location: lightly tested