This reverts commit 58e2a9ef.

It breaks CppunitTest_sw_globalfilter.

Change-Id: I0eb787d698276b86bf4d77a5300ea98cce0fdea5