am e9a51198: Revert "Adding debugging and naive fix for issue 15334203"

* commit 'e9a5119836e5e3310c474cb4bb5b7a727bc2415f':
  Revert "Adding debugging and naive fix for issue 15334203"