Workaround MCPC+ shortcomings for now.

Fixes #1549