[FIX] revert MP lp:754339