Reverting HO to the old setup for compatibility