Update to play nice with eshelf.