Revert "Updated support lib"

This reverts commit 2a0ca52b54b98c7a1f4355dfead9a5073e2f6f8f.