from old, probably dead code. Completely untested. But at
least it's not in my grep results anymore.

Change-Id: I9d917d0558bcab25a48fa36140beaa92150b62c9