Revert "And make things a little bit more parallel"

This reverts commit 5b10a1557c4f4e75602afc4d4419d62d6e0e20c2.