Moving back to original stub setup