Bin code that died in 2010 in d4dbc31173487a97e4b022f0bb9dae25440856a8

Change-Id: I5b88b7c66c1c3a3c68e6a837d10e7477cb7ae8fe