Revert "glacier: cleanup props"

This reverts commit e0145479d75f353c39e207ba91ee117057c517c5.

Change-Id: I9aa0eed6a8121db1dcccf82c742869ac613ec7ea