diff --git a/esphomeyaml/components/switch/gpio.py b/esphomeyaml/components/switch/gpio.py
index dd58f4bc6e..6ad76e9bd6 100644
--- a/esphomeyaml/components/switch/gpio.py
+++ b/esphomeyaml/components/switch/gpio.py
@@ -1,17 +1,18 @@
 import voluptuous as vol
 
-import esphomeyaml.config_validation as cv
 from esphomeyaml import pins
 from esphomeyaml.components import switch
-from esphomeyaml.const import CONF_MAKE_ID, CONF_NAME, CONF_PIN, CONF_POWER_ON_VALUE
-from esphomeyaml.helpers import App, Application, gpio_output_pin_expression, variable, add
+import esphomeyaml.config_validation as cv
+from esphomeyaml.const import CONF_MAKE_ID, CONF_NAME, CONF_PIN
+from esphomeyaml.helpers import App, Application, gpio_output_pin_expression, variable
 
 MakeGPIOSwitch = Application.MakeGPIOSwitch
+GPIOSwitch = switch.switch_ns.GPIOSwitch
 
 PLATFORM_SCHEMA = cv.nameable(switch.SWITCH_PLATFORM_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_variable_id(GPIOSwitch),
     cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(MakeGPIOSwitch),
     vol.Required(CONF_PIN): pins.gpio_output_pin_schema,
-    vol.Optional(CONF_POWER_ON_VALUE): cv.boolean,
 }))
 
 
@@ -22,9 +23,6 @@ def to_code(config):
     rhs = App.make_gpio_switch(config[CONF_NAME], pin)
     gpio = variable(config[CONF_MAKE_ID], rhs)
 
-    if CONF_POWER_ON_VALUE in config:
-        add(gpio.Pswitch_.set_power_on_value(config[CONF_POWER_ON_VALUE]))
-
     switch.setup_switch(gpio.Pswitch_, gpio.Pmqtt, config)
 
 
diff --git a/tests/test1.yaml b/tests/test1.yaml
index ee8073aa82..caefcee0fe 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -716,7 +716,6 @@ switch:
     icon: "mdi:restart"
     inverted: True
     command_topic: custom_command_topic
-    power_on_value: True
   - platform: remote_transmitter
     name: "Panasonic TV Off"
     nec: