First part of #1438
device-2018-11-27-181216
This will create a new commit in order to revert the existing changes.
