This is the only 10.4-specific fix. The remaining known issues
will be fixed by merging commit bef843b9
from 10.3.