Revert 0943d3f..36dc667

This rolls back to commit 0943d3f065146825df8a71495372c1c70313d87e.