Revert 31fb549..cd7eb98

This rolls back to commit 31fb54957c2e0c56748ee338c8af9db39db8bd3e.