Revert, fixes