Revert "Work around for broken dependency"

This reverts commit 8e7425599565d0183a15fadebeab277fcf467a9a.