BE more assertive.
Merge bug26341