Revert initial prototype optimizations
Book has to include unoptimized code