Switching back to state before #1723 because it broke everything.
Switching back to state before #1723 because it broke everything.

adobe-photoshop/spaces-design,adobe-photoshop/spaces-design,lxfschr/spaces-design,lxfschr/spaces-design