A temporary location to help facilitate cleaning up this code again.