Revert "HKL to Q"

Reverts Nikea/NSLS2#172