Revert "Minor cgange (merge test)"

This reverts commit ee9765cfe7a9a978d47be531b19831d0766d1b0e.