Reverting build queue lock while troubleshooting stage bugs