Revert 6170f7e..6f3cd59

This rolls back to commit 6170f7ea127f9483063b0d9cce19302788c81293.