also, code duplication from https://github.com/mozilla/goggles.webmaker.org/pull/14/files#L16R10 -- can we unify this cleanly?