Revert prop

Change-Id: I26a6f2eac6cd6ae365b27a3fb83f45a112193135