Revert 7b78aef..b8f8de2

This rolls back to commit 7b78aef698c7de3ca30fa025341231176e8ae8e5.