In general, this is a very straight forward fix - I decided not to
cherry-pick directly from 58553a7f
as the diff exposes very radical differences.