Revert 8b9b177..2ca50bb

This rolls back to commit 8b9b177cc63a67a21b4b1885516210bc1c18c199.
Working again