Revert 57d7781..20c086f

This rolls back to commit 57d77814f6f9501c81a3d60404be7acf3b2a6114.