Revert "Fixed yet?"

This reverts commit 397542b73a2669fa1565d5f6eba5b50ddf6615a4.