I think this fixes the problems when the HEAD of master is added to nightly.
@aporeba , can you tagpkg this for nightly ? CC: @akazarov