Revert "min.'s / native-like changes"

This reverts commit 767fb7f5aed117e22278ac7ff2ef649db18f14db.