Fix build - restore older behaviors

Change-Id: Ie9f88806b1083f0b4ef99731bd4f1e42fff467fe
2 files changed