Revert "fix merge conflicts for SCHOLAR-3.x #2675"

This reverts commit 8b66f56be4a5a81dfd4ad2506e5c93f0c18bb51c, reversing
changes made to bbc444fc34b39f52cc070210bdd4121a3db90d60.