Reverting to master hoa/core.