Revert "4.1 - 4.39"

This reverts commit 68d88bcd9b7cd4663487f8091407224b41ec2be2.