Revert "Fix the new compatibility issue in #5407"

This reverts commit 07b6ae76ba5506a2a19d88f247c6903294c0b571.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	utils/build/build.py