Revert 063cc8e..860bb9c

This rolls back to commit 063cc8e4aab3d009d22057c6bf9941219803211c.
Build files updates
merge changes