Revert 799d83db85a43765af65e1aaf4aa42f84fa09b9d partially

Make 6.3.0 back. 6.4.0 breaks adlibr spec