Bug 1230407 was at least two problems, split apart.

Bug 1230407 should be the neutron bug and use a separate bug for the
other part.

Change-Id: Ib7e909ed17ef6b7a2a210af405b97dc43c4d688f