Revert "more touch-ups"

This reverts commit 738c92d846c5a804b1119e42fa73d0664950912d.