Do the previous commit a bit simpler. :)