b00a1d6b7f
I mean't to attach that to the bug not revert it. This reverts commit 23a9fb0314428c9e805f3434437d3d3a59a06bbe.