#3450 is a temporary patch and has to be replaced with one that sets `__invalidated` to `True` instead. See the comment in #3450.
