Revert 7706831..e5b03a7

This rolls back to commit 7706831192d3a739c54e15c00bf301d282471e6e.