Revert "Merge remote-tracking branch 'taitemsDev/develop'"

This reverts commit 715c3935f0e411b5bbf3672c6713e42ce0fc187a, reversing
changes made to 4648d10da5a96c4d943730578c40d99bc6e31d6f.

This merge may not have completed correctly, so I'm reverting it to be safe.