Revert last commit, performance gain (of changes that were only possible after these changes) wasn't as high as expected.