Revert "Updating from branch"

This reverts commit d9ebe9dbb213fd50a9483aa4af129506570f9604.