Revert the last, and do it correctly...