Revert "Organize imports" as irrelevant in 5.8

This reverts commit 6ec4404ef77ed1e3c62e5f5ec7bd121f85a79c6e.