Updated to build on 4.4 without needing modified 19-internals platform