Revert abc28a1..3cdbfa4

This rolls back to commit abc28a16c1d6860dbe92534baa571ad22c3e2ff4.
Revert 3cdbfa4..621afed

This rolls back to commit 3cdbfa4622493bf948876fd4b4b83b3ffdde7320.
Fixed hosting issues