Removed s tweak, integrated in by a prior pull