reverting changes made for FF15 in #24 to fix space problem in #69