Revert b3878ea..2f1ceaf

This rolls back to commit b3878eac76e9a79bf2bb9328a238073fbec0c162.