But still keep it in case it'd be needed again, or simply
as a starting reference.

Change-Id: If519e1320e1bd6dce7746b57172324b33504051e