Revert "PropModder"

This reverts commit 3891e7d9dc5c740565a2cb127ef0b631952c53c3.

Change-Id: I25250c5b8e924aef56000474aa373e63d0893e31
Merge "Revert "PropModder"" into kitkat3