Revert 434300d..fc2b0a6

This rolls back to commit 434300d0e3e4a7a58b7776881fd11f8df3adeb7b.
update to latest changes