Disabled Some Features From Reverted Commits.