Revert revert re-install guard