Revert to {:key => value} style