Revert to @hybrid_property use as a listener for some attribute changes