This reverts commit fa21c7a9.

The reverted patch caused more harm than benefit.
Signed-off-by: NJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: NLuciano Coelho <luciano.coelho@nokia.com>
Tested-by: NTuomas Katila <ext-tuomas.2.katila@nokia.com>
Signed-off-by: NLuciano Coelho <luciano.coelho@nokia.com>