Removed an unecessary function.

It was introduced by the refactoring in 5a4e63e6 and made redundant by
the refactoring in 18934677.