Revert "Merge branch 'revert-de26b492' into 'master'"

Package Merge Request

Package Changes

Reverting the flux changes revert so we can fix those issues before the next release

Package MR

n/a

For Issue

Closes #3143 (closed)

Upgrade Notices

n/a