Going back to AF4, with a tweak