Revert "Starting to add support for global/generic device options, e.g."

This reverts commit 53e5ea4f30d624c26d08b17655350eb72e39d67b.