This reverts commit 981664df08. Reason: 4.19 isn't EOL for us, hell, 4.4 isn't even. Change-Id: I62bbfd0aa2b2262340c40a923aa02f221787f9cb
981664df08