Partial Revert "Per-App-Expand: ExtendedPropertiesUtils"

This reverts commit b705cead920930c52e0a313636eb65d3461deddb.