Fixed #1907

Reversed out #1883 since it was causing browsers to (easily) crash.
Merge pull request #1915 from jsbin/fix/1907

Fixed #1907