Revert "Merge branch 'develop' into feature/accordion-resource-menu"

This reverts commit 37237a7ba0ccdc8167151ea943085cb44d4f709b, reversing
changes made to e27e0c881e184ab0a0114e80f97903bb21ef4011.