diff --git a/src/eval_context.rs b/src/eval_context.rs
index cc3d02d8ce2..97b6203ec06 100644
--- a/src/eval_context.rs
+++ b/src/eval_context.rs
@@ -16,10 +16,7 @@ use error::{EvalError, EvalResult};
 use lvalue::{Global, GlobalId, Lvalue, LvalueExtra};
 use memory::{Memory, Pointer};
 use operator;
-use value::{PrimVal, PrimValKind};
-
-// FIXME(solson): Remove this.
-pub use value::Value;
+use value::{PrimVal, PrimValKind, Value};
 
 pub type MirRef<'tcx> = Ref<'tcx, mir::Mir<'tcx>>;
 
diff --git a/src/lib.rs b/src/lib.rs
index 1400d637767..4617a35b350 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -43,7 +43,6 @@ pub use eval_context::{
     Frame,
     ResourceLimits,
     StackPopCleanup,
-    Value,
     eval_main,
     run_mir_passes,
 };
@@ -62,4 +61,5 @@ pub use memory::{
 pub use value::{
     PrimVal,
     PrimValKind,
+    Value,
 };