Revert "modules-gnu"

This reverts commit a0e0c0398173a0b36ef166f914e8334a11bab1f5.