revert master forms to match upstream