Merge "Remove ugly function existence check"