b20e22d018
This reverts commit 9d1d79b004ed7171f481225993d54c3b100411a7. An alternative workaround will be implemented in the next commit.