Revert "more granular transactions in grading [LMS-1480]"

This reverts commit 19dd49f35510f9713899534e049edbf1ffe1250a.

Hotfix for grading problems seen in OE (LMS-1493).