Revert "Bug 565752 - QuickFix is blocked by conditional expression"

This reverts commit 88c64c64b5d5d01125a7a607fbfd2f9dde45da9c.

Reason for revert: not fixed

Change-Id: Ief4ad54d93058e0a26209a8a62b0e3f7beb82b96