Revert "This doesn't work"

This reverts commit 6d20c9829be7dc5e8f1b0203ebfcd8eaf908b4f2.
Merge branch 'refs/heads/2.3/develop' into 3.0/develop
This DOES work
This DOES work
Merge branch 'refs/heads/2.3/develop' into 3.0/develop