Revert @e9497a4 so it builds everywhere