R1:ffb074424d0b

Quick fix, unbreak Herald. Proper fix should not go down this path.

Auditors: btrahan, makinde