Revert 38e598f..f4419ba

This rolls back to commit 38e598fad27096a14d36ae87be9f02add5c14632.