Gratuitous hacks until D5151 lands

Auditors: vrana