Revert e284a23..31ef271

This rolls back to commit e284a23e83c38c439b4a3bb2926cb9e9b7c5bf49.
Revert "Revert e284a23..31ef271"

This reverts commit bb15836b45dfde433cce64c24af5da0a3cd35068.