Revert to 7925bb62e0187ea8cabc66dc19afd8347920fab0
Abak fixes and tunes