Revert r26060. A better fix was found. The acceleration should be fixed once for...