Revert "Working again"

This reverts commit 67405ca8cb49bc0e5da95489ad88d686f26b1ebf.