Revert "external commit"

This reverts commit 3172e0d4ff71857c7ce26d86299e736a2f7edf0e, reversing
changes made to c03d3467c40672cd84ba2e3212b6f7bca2a1f708.