(FR #1829) OOPS! we will want the 'custom' data

This partially reverts screwup in 4e7137dd15795882676428be777bc134121ebff7

Change-Id: I5b1f30845f298c393e8df58a15ac82036d43a757