Our SPL layer for bolt() functions is broken, add simple work around