Revert 82b4a2a..e4855cc

This rolls back to commit 82b4a2a11536d2b086e8ae62f1747d12ff83925b.