Revert "Merge branch 'non-category-modal-editor' into staging"

This reverts commit 7cc48d63cd3f0304dd1eadc01438c40f3b31f3a8, reversing
changes made to bf8de57da1c437fb94903c1919bda9f60feaa4be.