A test kernel with these two reverts is being rebuilt in the same OBS project, home:tiwai:bsc1131062. The result will be 4.12.14-*.g58fcc15.rpm. Please check it later.