Back out attempt to commit partial support for POIs as this is not at