[SUREFIRE-615] Reverse merging r982995 as this resulted in a failing integration test, so the issue is not fixed by the simple scope change... will need some code changes as well :-(