Revert "Merge pull request #2628 from jenkins101/rc6_mce"

This reverts commit c51c5bddd1cdc22cdd988d882dfe3a4f479065b3, reversing
changes made to 05fe001814e7bf3af42ef3a720620669cfadb0b9.