Revert "New trunk snapshot from ci"

This reverts commit 5ebba22ef570355597967ce7e3e3b4caaaca22e7.