Enable disabled simplification code after merge MTR (1)