Trival fix up for a bad merge that caused discard to be called twice.

Change-Id: I8c6bb5aaa2a25f2dc2fad94813f867866aabb138