Unbreaking wrong-direction conflict resolution from previous commit

Signed-off-by: Mike Rylander <mrylander@gmail.com>