From ca0985571edb59b60a45e6ddec2db0c2047dadcc Mon Sep 17 00:00:00 2001
From: Matthew Taylor <mewtaylor@gmail.com>
Date: Tue, 31 Jan 2017 11:38:50 -0500
Subject: [PATCH] Revert "Merge pull request #1149 from
 mewtaylor/issue/r2-4092"

This reverts commit 8e82398255ff4f65af6bea0754bed33f5dedda12, reversing
changes made to e1a0e9fece273619b03152d03c4940a66837e55a.
---
 src/components/registration/steps.jsx         | 44 +++++++------------
 src/l10n.json                                 |  1 -
 .../teacherregistration.jsx                   |  1 -
 3 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx
index 74c7089b883..433c2f04372 100644
--- a/src/components/registration/steps.jsx
+++ b/src/components/registration/steps.jsx
@@ -872,35 +872,23 @@ module.exports = {
                     </p>
                     <Card>
                         <Form onValidSubmit={this.onValidSubmit}>
-                            <Input
-                                label={formatMessage({id: 'general.emailAddress'})}
-                                type="text"
-                                name="user.email"
-                                validations="isEmail"
-                                validationError={formatMessage({id: 'general.validationEmail'})}
-                                required
-                            />
-                            <Input
-                                label={formatMessage({id: 'general.confirmEmail'})}
-                                type="text"
-                                name="confirmEmail"
-                                validations="equalsField:user.email"
-                                validationErrors={{
-                                    equalsField: formatMessage({id: 'general.validationEmailMatch'})
-                                }}
-                                required
-                            />
-                            <Checkbox
-                                label={formatMessage({id: 'registration.optIn'})}
-                                value={true}
-                                help={null}
-                                name="subscribe"
-                            />
+                            <Input label={formatMessage({id: 'general.emailAddress'})}
+                                   type="text"
+                                   name="user.email"
+                                   validations="isEmail"
+                                   validationError={formatMessage({id: 'general.validationEmail'})}
+                                   required />
+                            <Input label={formatMessage({id: 'general.confirmEmail'})}
+                                   type="text"
+                                   name="confirmEmail"
+                                   validations="equalsField:user.email"
+                                   validationErrors={{
+                                       equalsField: formatMessage({id: 'general.validationEmailMatch'})
+                                   }}
+                                   required />
                             <GeneralError name="all" />
-                            <NextStepButton
-                                waiting={this.props.waiting}
-                                text={<intl.FormattedMessage id="registration.nextStep" />}
-                            />
+                            <NextStepButton waiting={this.props.waiting}
+                                            text={<intl.FormattedMessage id="registration.nextStep" />} />
                         </Form>
                     </Card>
                     <StepNavigation steps={this.props.totalSteps - 1} active={this.props.activeStep} />
diff --git a/src/l10n.json b/src/l10n.json
index a34a2b5f4a8..1d264ffc3d2 100644
--- a/src/l10n.json
+++ b/src/l10n.json
@@ -125,7 +125,6 @@
     "registration.newPassword": "New Password",
     "registration.nextStep": "Next Step",
     "registration.notYou": "Not you? Log in as another user",
-    "registration.optIn": "Send me updates on using Scratch in educational settings",
     "registration.personalStepTitle": "Personal Information",
     "registration.personalStepDescription": "Your individual responses will not be displayed publicly, and will be kept confidential and secure",
     "registration.selectCountry": "select country",
diff --git a/src/views/teacherregistration/teacherregistration.jsx b/src/views/teacherregistration/teacherregistration.jsx
index d468085aea8..46cc34c7cc0 100644
--- a/src/views/teacherregistration/teacherregistration.jsx
+++ b/src/views/teacherregistration/teacherregistration.jsx
@@ -50,7 +50,6 @@ var TeacherRegistration = intl.injectIntl(React.createClass({
                     this.state.formData.user.gender
                 ),
                 country: this.state.formData.user.country,
-                subscribe: formData.subscribe,
                 is_robot: this.state.formData.user.isRobot,
                 first_name: this.state.formData.user.name.first,
                 last_name: this.state.formData.user.name.last,