This reverts commit 5d804566df. This was an error on my part. I had the commit sitting on my local master and pulled upstream to rebase my commit before pushing. I didn't notice there was a commit bumping lxc and the auto-merge on the rebase.
5d804566df
e43f2fc868