* Adjust for repository structure adjustments made in r2721