Revert "Correct yet more logic fail :(" This reverts commit 83b76da2c659bbff8d17236ef1b3e69a0ce6228a. First of 3.