Returning from here was breaking too many test cases.  So left it as it was.