Reverting some of the API changing modifications, so that master will build release 1.4.x