Followup to issue #2091911: Improved installation behaviour.