Undid some of the changes done by c95fbb4 because they are not compatible with docking code.

(Will cherry-pick this from docking to master)
2 files changed