Reverted back optimizations.
Finalize read optimization.