dalelane’s Twitter Archive—№ 15,498

Reviving someone else's unfinished code changes from a couple of months ago. I'm the ninth circle of merge hell. :(