Speculative fix for bad commit e3040.