Revert "Merge latest changes"

This reverts commit e4fdfba117dfb681cfdfe71511e2f5658faeb020.