Revert "Merge branch 'stable_images' into stable"

This reverts commit bbeeefac1331fa9913dd50a5bf47459077b69778, reversing
changes made to f1fc4683ac83ba0f547a1b65cd7688a15580d1e9.
1.10.0-7