re: #539 lostlakehiker

re: #545 albusteve

Aaaand, here we go again.