Revert: Support unowned map and map fields behavior (ed1fbeba9fda963bbd4318caa4b5ec7ddd92e175)