It seems like the code in this branch will adequately handle this case, so why add this?