Revert "2nd attempt at 790af4e400bb8c69ced0c42dff1e8c95b32a0f9e"

This reverts commit 0463cc3f1f7e56c18c8ed925822f946053a298b3 for now