Reverting previous commit, I want to keep unoptimized routines around for benchmarking.