fix(Legacy): Implement old behavior.