move back to 90c1119d13bb6b846c5cf2800a2a00c2c3a3dcbb
stop leaks of private data, post review fixes