But, I put it back for now, with a _TODO_ comment on deprecation and removal