Removed in 0abfac9