Revert "v1.5.1 QuickFix"

This reverts commit 59a32141045a24fbc0dc5dd05f26bdda5e35c207.