This lets us get rid of some PC2 imports.
mentioned in commit 0d737a68
mentioned in merge request !171 (merged)
mentioned in commit 89e3eb80
mentioned in commit a0a099ef