This reverts commit 7defda83. It breaks the package after update 61c46793; (cherry picked from commit 72e01357)