Revert "Merge changes from 'dev' into feature/dictionary-rewrite"

This reverts commit 83a2824dac7c75b1b9f177e9d02f86d306d9c339, reversing
changes made to 28e7d2be841cef0a8e6b5466e37dc4c4ae2fdea9.