Revert "Merge branch 'development' into production"

This reverts commit 97683a8620685d04d324261f3339c4ba9713d20a, reversing
changes made to b48fdffe8ddd488133848be6569c18ba0ded9ff6.