Unreviewed, a speculative build fix