Please review this "detection" patch for the following ticket:

The ticket will not be closed, but simply moved to a later milestone.

-- Matt