Fixed a side effect of previous revert.