We still need this

Change-Id: Iadd61c51186125fef5e9e29ddd63571fa9284a85