Revert ed4bec8..d834e7c

This rolls back to commit ed4bec8d6eba729f0ccf4a80e287338eb62686d1.