Revert 0703a29..0b0f36b

This rolls back to commit 0703a29cd27f1274937313e3af115a08e36a321a.
v2