Some assumptions are better than others.

(cherry picked from commit 91d8452ac86f4855394256159e570bb18e2793f6)