Stop handshaking with commons

Suspected this code is now redundant.
Disabling to gather some data on whether this is the case

Change-Id: I1e7c213a1bd212b5325be07e44040f4f4717eefc
Merge "Stop handshaking with commons"