Revert "pulled in flux changes"

This reverts commit b23243d69faa0924299b6397f5350fdc886a19c4.