restored defaults that were reverted in merge