Revert "Disabled 2-scan optimisation that exposed bugs in Opera 11 and Photoshop CS5"

This reverts commit d4b0de61e0689cdc2bcc30ad7d22ec9dce504477.