Removed origin hack. Properly sets origin now.