Proposed fixes for Issue 13547.

> Specially important for the use cases where performace requirements forbid such use.

Better leave that sentence out.