Revert a48b966..a807131

This rolls back to commit a48b966a5c0639afe8cf2b69b27b245fde11425b.
updated lib