block rev 7915 from being merged into the trunk, since the patch is