Trolley Noir is back. As is O'Connor's. 

Its bad that I can't remember what it was called before its current incarnation.