Revert "Merge branch 'release-v0.5' into design-updates"

This reverts commit 5cc33ad85b26ad4f27063d681f398aa8f2719ada, reversing
changes made to 678ebfffce08065ffb066d10e3c9bfe9a90875fd.