We've accepted this as a bug, and we'll track it for a future release. In the meantime, the 'Relink' feature is a very useful workaround to replace an existing layout within an article.
Thanks, and sorry for the inconvenience.
That worked as intended. Thanks for the tip, James!