Removed in 5347c43b40e203a03d1f98a1a2954ebe68c13e53