Move away from removed/deprecated lunchbox API