Reverted the previous simplification.