Revert "Merge from master."

Reverts tibor-mirnic/dextop#2