Revert 610d46c..20fc1d2

This rolls back to commit 610d46cb8b3fc090a557ce1c7ea88dc27b4ddf4a.