Move short-circuiting to deprecated section