Revert "Squashed commit of installd changes"

This reverts commit da3a62b02822946dceb61b10d9fa1248bd22cbcd.