Revert "kernel:workqueue: Try a CM rebase"

This reverts commit db6d3a2900fe022a27b226c2eb0c89de2a09ab31.