This reverts commit 8cd1f0d8. It causes issues when OMPT is disabled explicitly and dependences are not set correctly.