There is a lot of weird stuff going on there.  I've just reverted it for the moment until we can do some more thorough tests on it.  It might require full coverage in the handle function.  It's really all bound to how the attribute works on backend.