Revert 8caf5b5..82891a4

This rolls back to commit 8caf5b5c7bb6ef01a4578b75cb324e1985549afb.