Reverted Tayfuns commits