Revert d4a67b8..5dc39ba

This rolls back to commit d4a67b85c52adf2595994c7d1d8ae36d3f1f89e7.
asdf