Fix https issue (closes #2)
Remove workaround (not needed any more)