Please see the following patch that whether it makes sense to drop that
part.