Diff reduce with master by removing everything conf/179111 related