This reverts commit 9d9b0c51c8 as it was only meant for temporary testing and shouldn't be merged.
9d9b0c51c8