This reverts commit 3d4b277a.

Reverting temporarily for the sake of completeness and confirming
testing results.