Revert df759ba..d6e6d41

This rolls back to commit df759babb69ed2de60475fc90b161e31c8361819.
Now working again