Since #3115, this shouldn't be needed anymore.