Switch back to non-universal build for now (S4)