... and partly revert the corresponding pieces of
3d2f4343 that removed them as unused
code.

Change-Id: Ib5418df6a675004d0822b77ef12a77564d3348c8