Revert "WIP 1.5"

This reverts commit 0358ef2f936add04416fd4a80cf080a740fe7efd.
Revert "WIP Updating to 1.5"

This reverts commit 5f52847f6d2c01da310cc07e3fdc4043c295b082.