Also changed in 4f54f8bcb8fca1a813ae0310d11f31b108c4447e.