added from cesm-tools
reverted additions from cesm-tools