Revert a9d85da..ca1592a

This rolls back to commit a9d85da138bf602f2a04f1cf53542bcf75fb96d8.
Revert "Revert a9d85da..ca1592a"

This reverts commit 2ff40df2c5d40cbfb51e6160cd88ee1d6b3b7a33.