Revert "Better handling for getActualProperty"

This reverts commit fdd1f0411e0013adb31e2a303009428aa9dc0aa7.