               required=true
             />
           </fieldset>
-          <fieldset>
-            <TextInput
-              onChange={@updateDetails}
-              value={@props.course.timeline_start}
-              value_key='timeline_start'
-              editable={@props.editable}
-              type='date'
-              label={CourseUtils.i18n('assignment_start', @props.course.string_prefix)}
-              date_props={timeline_start_props}
-              required=true
-            />
-          </fieldset>
-          <fieldset>
-            <TextInput
-              onChange={@updateDetails}
-              value={@props.course.timeline_end}
-              value_key='timeline_end'
-              editable={@props.editable}
-              type='date'
-              label={CourseUtils.i18n('assignment_end', @props.course.string_prefix)}
-              date_props={timeline_end_props}
-              required=true
-            />
-          </fieldset>
+          {timeline_start}
+          {timeline_end}
         </form>
         <div>
           <span>Cohorts: {cohorts}</span>

    tags = if @props.tags.length > 0
      _.pluck(@props.tags, 'tag').join(', ').replace(/_/g, ' ')
    else 'None'

    timeline_start_props =
      minDate: moment(@props.course.start)
      maxDate: moment(@props.course.timeline_end).subtract(1, 'week')
    timeline_end_props =
      minDate: moment(@props.course.timeline_start).add(1, 'week')
      maxDate: moment(@props.course.end)

    <div className='module course-details'>
      <div className="section-header">

    online = <InlineUsers {...@props} users={@props.online} role={2} title='Online Volunteers' />
    campus = <InlineUsers {...@props} users={@props.campus} role={3} title='Campus Volunteers' />
    staff = <InlineUsers {...@props} users={@props.staff} role={4} title='Wiki Ed Staff' />
    if @props.course.school
      # FIXME: Convert lego to parameterized messages.
      school = <p>{CourseUtils.i18n('school', @props.course.string_prefix)}: {@props.course.school}</p>
    if @props.course.term
      term = <p>{CourseUtils.i18n('term', @props.course.string_prefix)}: {@props.course.term}</p>

    if @props.course.passcode
      passcode = (
