Undoing some broken changes on reading.