Temporarily reverting Single/Take SQL support