Roll back revision 313. A similar but far more exensive change was made in our internal branch, which will be integrated soon.