Update docstring to reflect changes in #772 and roll back erroneous merge