Backing out the change due to non-trivial test problems in nightly testing. Reviewed-by: jwilhelm, mgerdin