ref #2649, clean up previous commit