Oops... that wasn't a duplicate change handler. (Partially) Revert
previous commit.