Revert image timeout test code