Revert "Change get_hotspot()" and move it into a
branch where it belongs.

This reverts commit d71b011811bb0ecad13b44c4047a2a72f0446752.