Revert: Revert fixes