Revert "sync jf props with aokp"

This reverts commit 159167099c592232717fdc64842e1908c2bbd7ef.