[WIP] Revert some changed