Bin code that became dead after 8ecf956d79878c9b24f5ddc51d6b723a76d334f5

Change-Id: I310abed7e86f8b7153817be5ae03cc3c8fec3c50