Revert "more stroke fixes"

This reverts commit 30f4c0f39adfa379b70d7e69e6b8aa6d9219f884.