Revert "simplified call to compute enhancements", unlear goal, missing justifying issue

This reverts commit 2ebc828a05a3ddaccb431f7b6db9d7b5625b1737.