As with code, it is always useful to factorize common path to let future changes be error-proof.
This will create a new commit in order to revert the existing changes.
