Fixed upstream, removing hacky bit