For future reference, you don't need to modify this block anymore.