Partially revert 8bfa805 since backward compatibility should be appeared.