Restore Berkshelf 2 support... again