JA|DN: Revert fix as it doesn't fully work