Revert "1.4"

This reverts commit 00ad1bcb8e62c6e9d2c86f0a312889359197877d.