Reverting wrong commit from last MST import

This reverts commit de1f6184a864613a03c992e640915c105fe067ed.