From 948a5c97eca7e78ea614a96a0988edd090726045 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Sat, 14 Mar 2015 19:13:03 -0700
Subject: [PATCH] Fix a config bug in Automation

---
 config/configuration.yaml.example               | 3 ++-
 homeassistant/components/automation/__init__.py | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/config/configuration.yaml.example b/config/configuration.yaml.example
index 51217c090bb..c758833d336 100644
--- a/config/configuration.yaml.example
+++ b/config/configuration.yaml.example
@@ -101,7 +101,8 @@ automation 2:
   time_seconds: 0
 
   execute_service: notify.notify
-  service_data: {"message":"It's 4, time for beer!"}
+  service_data:
+    message: It's 4, time for beer!
 
 sensor:
   platform: systemmonitor
diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py
index 33eef9fe3dc..21bea96201b 100644
--- a/homeassistant/components/automation/__init__.py
+++ b/homeassistant/components/automation/__init__.py
@@ -5,11 +5,10 @@ homeassistant.components.automation
 Allows to setup simple automation rules via the config file.
 """
 import logging
-import json
 
 from homeassistant.loader import get_component
 from homeassistant.helpers import config_per_platform
-from homeassistant.util import convert, split_entity_id
+from homeassistant.util import split_entity_id
 from homeassistant.const import ATTR_ENTITY_ID
 
 DOMAIN = "automation"
@@ -54,8 +53,7 @@ def _get_action(hass, config):
         if CONF_SERVICE in config:
             domain, service = split_entity_id(config[CONF_SERVICE])
 
-            service_data = convert(
-                config.get(CONF_SERVICE_DATA), json.loads, {})
+            service_data = config.get(CONF_SERVICE_DATA, {})
 
             if not isinstance(service_data, dict):
                 _LOGGER.error(