Second part of #3848

The 2.5 typo fix of #3848