Optimization was incorrect, so revert this commit. This reverts commit 83375bcc5c69121ebad7c1df67211ac08729c570.