Back out ReferenceProperty changes since they aren't needed.