Bin a dead ifdef

Change-Id: Iaebfff208767ce5032f94676f180999720b20fae