[SQUASH] Remove bundler hack, use system fpm