Revert "[3] Applied patch 2"

This reverts commit ddfd375f053c6875c38172ebf79fb533d8c4620a.