Revert 7712aaf..9746370

This rolls back to commit 7712aaf6d3f20210e3ff8f745fadd1686dcd7d43.