Reverted [FXOS-104] to let crdlc do his own thang