Revert 1d89ea0..d135e53

This rolls back to commit 1d89ea02344b587e5f5cd88ff8bb015f5287b257.