Removed in 5814d86