Revert "4xm: Prevent buffer overreads."