backout the backout

This reverts commit 712557cb18e8b61b2f5911cfb6a9ecbf10d8d4ba, reversing
changes made to 8128f25736db1ea2796887ff1af7c53107577a21.