This reverts commit ac428e25e0. This PR causes wgrad to hang during testing. Revert it until we resolve the issue
ac428e25e0