Replace new changes with reworked code from an older commit