Revert 5e20ee9..a2ea59b

This rolls back to commit 5e20ee980f70a93317b1568ee016e360b785b7cb.
Revert a2ea59b..a3ae061

This rolls back to commit a2ea59b2fd8364c2922d4d10d9276944ea73470b.
Upload test

upload test