Revert 10443c0..4cf6622

This rolls back to commit 10443c0a44db1f09f2f5cf01e111b8a0d59872f4.