Revert "Hot ninja fix"

This reverts commit 5113668f6998fc68727434ef395359dddacd64a4.