Undid previous breaking API change