Revert "another attempt to get the stop method working like intended"

This reverts commit 658e7532e1377a8b9c0507d386319dc07772632c.
Revert "bug fix for stop method"

This reverts commit 1fa974ad5476a6da34af71c44bef00aec42ac5f3.
Revert to a working copy