Taken from #1460 w/Donnell Rawlings: