Revert "Quick workaround"

This reverts commit 68f51c6cb92a625973f8a36055650c7053f22a34.