Revert b193765..fc0f327

This rolls back to commit b193765be08c270012c2ae47310d750a3044e2be.