This isn't deprecated, bring it back