Tone down #123 a bit