Undo PR #44 -- breaks customizations.