Revert change in 8f6e319.