Revert of QuickFix 1 and 2