This reverts commit 31bae8490a334b1a70abed1df042cbe00bbc9d3f. It is possibly too early to incur this breaking package.