This reverts commit 77d32b7e. This patch is obviously wrong (causes array accesses at index -1), and I caught that just too late.