In Emacs 25, I do not observe the reported behavior.  Following the
reproduction instructions gives me the "correct" behavior reported to be
present in Emacs 22.3.  I suspect that this regression has been repaired in
the meantime.

Best Regards,
Jeff