Great catch Colin, thanks! Feel free to add my: Reviewed-by: Guilherme G. Piccoli <gpicc...@canonical.com>
P.S. Not sure if it's only me, but the diff is soo much easier to read when git is set to use patience diff algorithm: https://termbin.com/f8ig
