revert previous change; more work to do