Reverting last change in favor of targeting jb43 branch.