Revert "switch to current library (with the fix!)"

This reverts commit 93f5c243ce03d447240fc9b97a681e3d5bc22bb0.