Revert 7c820ac..7785428

This rolls back to commit 7c820ac486a46979706280029f7d488bf147bb94.
Revert 7785428..69022eb

This rolls back to commit 7785428c6129504f0a9541a555c43a367df8757b.
rydding..