Revert 8f6eb794c14c7100fae260c58aeb9844fd21b8f2