Revert 4aa5122..9ab23ef

This rolls back to commit 4aa51226002fe3e02e0e3fd7ff1794b271813e0c.
Image id changes