Lets go back to this as it was working fine.

Change-Id: I58e66c9486727b4531f4a22eeec99c49d4f93534