Removed the workaround for firefox, see #30