Rollback changes from failed 1.4 release