Revert: workqueue commits