Revert 3e2916d..a0edf34

This rolls back to commit 3e2916dbdb91b5e9cdca2ebeab9645e2d4b8a8e7.