Revert "CLASSDOJO merge updates"

This reverts commit a9ee4ac598845beb43b1578e4d4fb2f07a91c83f, reversing
changes made to 1ffb93a0a6692485c0c5c2c045dbbcefae0f0abe.