Revert "Merge branch 'master' into scholarship_module"

This reverts commit 67735a74e34eaeaadf1a8d806a70f410fadfe461, reversing
changes made to df9c3633a5bbd843abb62663d075bb5d6c7d2822.