@ehershey Sorry, didn't meant to steal your commit.  Is this block still needed?