Put back in normal failing completion and clean up implementation.