revert inadvertant change from 1.5 branch