Revert Add lib broke data...