Patched with diff file from https://codereview.appspot.com/13176043/#ps3001