Revert 6854c07..fc73f95

This rolls back to commit 6854c07ab963635684aa9a0fc3dfce0a4b3a3a8d.