Reverted to simpler transformation management strat

Signed-off-by: Ozan Turgut <ozanturgut@gmail.com>