Revert r97580; that's not the right way to fix this.