Improves fix for https://code.google.com/p/go/issues/detail?id=4459