Revert to to_hrt()