Revert "Merge branch 'AJ_DEV_02--THE-DEV-STRIKES-BACK'"

This reverts commit ad533d1934e26263f5f02f4b619c37feacb7d7f2, reversing
changes made to d8502a650016d77c4b310f0b307bf7478eccf262.