You can delete this change now, it will be merged from 2.4 soon.