Revert "8u"

This reverts commit cbe9da36593d211f94f1670806b387fecdf72906.