Revert "Use proper api"

This reverts commit 997b676d1a156f83f4c21d00ef499b88ce71b1e3.

Breaks multiple concurrent su request