Revert "1.3.6"

This reverts commit 6de213eab41677f718a19e0423459407c1078a6c.
Revert 6de213e..34bdde8

This rolls back to commit 6de213eab41677f718a19e0423459407c1078a6c.
Revert "Revert 6de213e..34bdde8"

This reverts commit 6c265d8796aabdf0ef1e06cae2eaea009aaf6a0f.