Restore build after moving non-portable modules to legacy