[CAMEL-4671] Reverting 1201768 (with permission from gnodet, the orinal author) due to issues it is causing as discussed on dev list.