A fix to https://tracker.moodle.org/browse/MDL-27774 for our own theme
without needing a workaround.