Port of changes from https://github.com/Guggenheim/guggenheim.org/commit/49bb03296effe8d289a92814bb2bdc0548da5f92#commitcomment-2848495