partial revert of 743e627b
because we want to use that then unused code now

Change-Id: I94fe173dda053ce1b72b3b776a9855ce9ecc249b