This module fails to load due to the missing end
Land #2917, fix syntax error
Merge the broken module fix because it's annoying