Applying extractOrigin fix.
Adding original source to comment.