This hasn't made it into master yet but is important for mono support. If this turns out to be the wrong call we'll revert and merge whatever next version of this becomes available.