Revert "More speed?"

This reverts commit f5f31c671e2bde571a10345bb719c8ade0a7a537.