Witchcraft fix attempt
Revert "Witchcraft fix attempt"

This reverts commit 876407cb35ad9cb379689a5ba5fb0731a6409784.