This reverts commit e86010f9.

Reverting on Monty's request, as this change makes merging
things from 10.5 to 10.2 much harder.