Reverting r1646165. It seems that changes that we did for <property-to-field> are not needed. I will commit the new changes soon.