Revert "Fixes for device specific dock support"

This reverts commit 43b80df7aea2fa6fa973ca3c5d639ee3f5582fd1.