Revert problematic fix for ENSWEB-968.

This reverts commit 145de3c and 6eeee52.
Refix ENSWEB-968 / ENSWEB-1035.