Revert 80d9629..f2a6490

This rolls back to commit 80d962901af052a4f7e5cf3604ec7c1ed9095f7e.