Backed out changeset 9d7ae79baf16 (bug 1019668)
Backed out changeset 3e7908638c2a (bug 1019668) for timeouts during test_nfc_error_messages.js