Revert 6f57a55..d2dc686

This rolls back to commit 6f57a551f749c22cb9d968d4488c5e947938361e.