Revert back to known working