Looks like my improvements weren't so great

This reverts commit 58ea6afcee3f3747de142d05eb72672006142a8f.