fix(revert): reverting a couple of 0.26.2 fixes#1267

wass3rw3rk merged 2 commits intomaingo-vela/server:mainfrom

revert/26.2-fixesgo-vela/server:revert/26.2-fixesCopy head branch name to clipboard