Removed duplicate fallback.
Removed flicker-inducing workaround.

Fixes #267.