Changed back hash key format back to 1.8 format