Please patch it up and keep going, put the necessary commit somewhere where Shervin can tack it onto the PR. @shervin86