Disable problematic code

Change-Id: Idba10a05b06456985e1e23ec934d8f63c0d78a28