Revert 6eec659..11c4aa2

This rolls back to commit 6eec659b89771a102f911f1f7fb706601f62e703.