Revert "improved fix for issues with Chrome"

This reverts commit 8f1225ea6e4a544bc6010ffe0b22e6cbd29f04a6.
use only part of commit 8f1225e that fixes bug with chrome, revert the rest
Merge remote-tracking branch 'gargoyle/master'