Revert "Merge tag 'v3.17.2' into wf2-develop"

This reverts commit 278089a5d538c2e16bd47f2bcec71a7e1777a29f, reversing
changes made to 89d04efa238f3a2ddbf137ad7c6fe7f49fda1740.

Conflicts:
	src/loader/js/loader.js