Revert "Workable Build"

This reverts commit f74c8b6e08f646a784ba00120b2cf5728f857dc2.