Revert to i3, yet again