Revert "Changes after M101J certification"

This reverts commit 53b400dcbda7fe92249c5dab0e15421a8e9947ff.