Restore Tor and Tyler's changes...