Revert "Merge commit 'c896e6e95aba73b58bd1df95d9f2d9c059fe49cd' into issue/790-remove-unused-art"

This reverts commit b0c53498d0e8552c0530dd52b0433d0f3ff7e306, reversing
changes made to e9f1bcdb5804e59057f846f8a3d75ccf866bcbd6.
Revert "Merge branch 'develop' into issue/790-remove-unused-art"

This reverts commit e9f1bcdb5804e59057f846f8a3d75ccf866bcbd6, reversing
changes made to 175487ec1e55134dd2d74f7c02cf10e88212e088.