Revert 92a7d20 to keep all the features unchanged.