Revert 6812f68..070048d

This rolls back to commit 6812f68564f244c7fc18fd4334fb3b4decb239e0.
conflict 2