Revert topic 'vs-masm'

It needs to be revised for the VS flag table support.
Merge topic 'vs-masm' into next

dcf6cf40 Revert topic 'vs-masm'