Removing the cake (bug 747570)