#47: Undo the rename as it breaks the public API.