safari state plugin improvement
Revert "safari state plugin improvement"

This reverts commit dd8de29935e384f02e9c849d6ffd5c7e92403b88.