This reverts commit 57481b0e94b1d4be944c623ffa8334cbd4d53cbb, it contains some accidentally commited changes.