Revert "3.0.0 Updates"

This reverts commit 5e35b7e8fd1b674c990f53a6a2eca76a438918be.