Revert "Add convenience function"

This reverts commit cf92e8539eca8a7399d84f1b72d9d6aef2fc6f27.