Revert "QuickFix"

This reverts commit 331bd2f50d481de23091c7ef6c1722d4dc3f088d.