Revert "Merge branch 'swasey/progress' into 'master'"
This reverts commit 849abb8d, reversing changes made to 8de0b894. The merge was done accidentally, before review happened.
This reverts commit 849abb8d, reversing changes made to 8de0b894. The merge was done accidentally, before review happened.