Fork : Revert partially MP1-4307.