Really reverted Danny's latest changes.