not convinced this is the right approach

This reverts commit a9f480ee36a619d6ae67293c882b95f4fe24f9e6.

Change-Id: Ia1b5ad86f05eccb26f8393646b3dccd51c01e7bd