Complicate checking out from upstream master