Restore install dir in more situations