Revert "Upgraded to match the latest framework."

This reverts commit 3d4280e6d27eb6c195e26964e46331215b067955.
Revert "Revert "Upgraded to match the latest framework.""

This reverts commit ecb3c2c2817b368ed3e94f7bf0b5571bad08b9ea.