Revert some changes of KLP MR2