device-2018-11-26-202040
One more part of #1242 (closed)
This will create a new commit in order to revert the existing changes.
