Make sure schemaless property value is honored over __data

/to @ritch: It should fix the problem that you ran into.