Maybe Make Revert  and  this additional change as a Separate commit.
Naming as "Revert #5044 and improve" something