fix build

Revert incorrectly merged f8a4cb410115045278f534e54b41ac78d6bf6c07.
Merge 7c3c2fa3e233c656fc8c2fc2a6634b3ecf8a23e8 instead.

Keep fixes to these that were merged in since then.
6 files changed