Revert "Remove S4 tweak for now"

This reverts commit d0d2147bf544c08be62c5fe54278590d881f7574.