LU-119 Remove code added by a conflict resolution

LU-119 Remove code added by a conflict resolution

I erroneously re-added some code that was removed in
62345145fa7cae1846f96078bac43ddf58cea640 while resolving
a conflict in LU-85's landing of commit
ab13b69b63ca19d7fe68b8ba6afd2cb4723db78c.

Signed-off-by: Brian J. Murrell <brian@whamcloud.com>
Change-Id: Id2489a3aa5560cdf4e7cf4755ddc16437558a2fc
Reviewed-on: http://review.whamcloud.com/304
Tested-by: Hudson
Reviewed-by: Christopher J. Morrone <morrone2@llnl.gov>
Reviewed-by: Robert Read <rread@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>