Update for lib-1.5-cores format.
Revert "Update for lib-1.5-cores format."

This reverts commit 46ba7eb90d0ece2cc54f560fb753a4349e013050.